Skip to content

Pacification Prevents Throwing Weapons#1433

Merged
VMSolidus merged 6 commits intoSimple-Station:masterfrom
angelofallars:pacification-throw-fix
Jan 5, 2025
Merged

Pacification Prevents Throwing Weapons#1433
VMSolidus merged 6 commits intoSimple-Station:masterfrom
angelofallars:pacification-throw-fix

Conversation

@angelofallars
Copy link
Copy Markdown
Member

@angelofallars angelofallars commented Jan 5, 2025

Description

Prevents entities who are Pacified (through the Pacifist trait or being a thief) from throwing items that deal damage on hit or embed.

Technical Details

Two components will prevent throwing if they deal any damage: DamageOtherOnHitComponent and EmbedPassiveComponent.

The pacifist check on EmbeddableProjectileComponent has been removed, because just because an item is embeddable does not mean they deal damage.

Media

Throw attempt with the Pacifist trait

image

Changelog

🆑 Skubman

  • fix: Pacified characters (Pacifist trait and thieves) can no longer throw items that deal throwing damage.

@github-actions github-actions Bot added Changes: C# Changes any cs files Changes: YML Changes any yml files labels Jan 5, 2025
@github-actions github-actions Bot added the Status: Needs Review Someone please review this label Jan 5, 2025
@github-actions github-actions Bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 5, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jan 5, 2025

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
@github-actions github-actions Bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 5, 2025
@VMSolidus VMSolidus merged commit 71e3c03 into Simple-Station:master Jan 5, 2025
SimpleStation14 added a commit that referenced this pull request Jan 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changes: C# Changes any cs files Changes: YML Changes any yml files Status: Needs Review Someone please review this

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants